diff --git a/CMakeLists.txt b/CMakeLists.txt
index 419e8b7..97ef1c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,11 +26,11 @@ add_executable(LotoStatek main.cpp
         sources/Rocket.cpp)
 
 if(WIN32)
-    set(SFML_ROOT "${CMAKE_SOURCE_DIR}/SFML")
+    set(SFML_ROOT "${CMAKE_SOURCE_DIR}/lib/SFML")
 #    set(SFML_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/SFML/include")
     file(GLOB BINARY_DEP_DLLS "${SFML_INCLUDE_DIR}/../bin/*.dll")
     file(COPY ${BINARY_DEP_DLLS} DESTINATION ${CMAKE_BINARY_DIR})
-    include_directories("${CMAKE_SOURCE_DIR}/SFML/bin" "${CMAKE_SOURCE_DIR}/SFML/include" "${CMAKE_SOURCE_DIR}/SFML/lib/cmake/SFML") # dodane
+    include_directories("${CMAKE_SOURCE_DIR}/lib/SFML/bin" "${CMAKE_SOURCE_DIR}/lib/SFML/include" "${CMAKE_SOURCE_DIR}/lib/SFML/lib/cmake/SFML") # dodane
     set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake_modules") # dodane
     find_package(SFML 2.6.2 COMPONENTS graphics window system audio REQUIRED)
     if(SFML_FOUND)
@@ -38,9 +38,9 @@ if(WIN32)
         target_link_libraries(LotoStatek ${SFML_LIBRARIES})
     endif()
 elseif(APPLE)
-    find_package(SFML 2.6.2 COMPONENTS graphics window system REQUIRED)
+    find_package(lib/SFML 2.6.2 COMPONENTS graphics window system REQUIRED)
     target_link_libraries(LotoStatek sfml-graphics sfml-window sfml-audio sfml-system)
 elseif(LINUX)
-    find_package(SFML 2.6.2 COMPONENTS graphics window system REQUIRED)
+    find_package(lib/SFML 2.6.2 COMPONENTS graphics window system REQUIRED)
     target_link_libraries(LotoStatek sfml-graphics sfml-window sfml-audio sfml-system)
 endif()
\ No newline at end of file
diff --git a/SFML/bin/openal32.dll b/lib/SFML/bin/openal32.dll
similarity index 100%
rename from SFML/bin/openal32.dll
rename to lib/SFML/bin/openal32.dll
diff --git a/SFML/bin/sfml-audio-2.dll b/lib/SFML/bin/sfml-audio-2.dll
similarity index 100%
rename from SFML/bin/sfml-audio-2.dll
rename to lib/SFML/bin/sfml-audio-2.dll
diff --git a/SFML/bin/sfml-audio-d-2.dll b/lib/SFML/bin/sfml-audio-d-2.dll
similarity index 100%
rename from SFML/bin/sfml-audio-d-2.dll
rename to lib/SFML/bin/sfml-audio-d-2.dll
diff --git a/SFML/bin/sfml-graphics-2.dll b/lib/SFML/bin/sfml-graphics-2.dll
similarity index 100%
rename from SFML/bin/sfml-graphics-2.dll
rename to lib/SFML/bin/sfml-graphics-2.dll
diff --git a/SFML/bin/sfml-graphics-d-2.dll b/lib/SFML/bin/sfml-graphics-d-2.dll
similarity index 100%
rename from SFML/bin/sfml-graphics-d-2.dll
rename to lib/SFML/bin/sfml-graphics-d-2.dll
diff --git a/SFML/bin/sfml-network-2.dll b/lib/SFML/bin/sfml-network-2.dll
similarity index 100%
rename from SFML/bin/sfml-network-2.dll
rename to lib/SFML/bin/sfml-network-2.dll
diff --git a/SFML/bin/sfml-network-d-2.dll b/lib/SFML/bin/sfml-network-d-2.dll
similarity index 100%
rename from SFML/bin/sfml-network-d-2.dll
rename to lib/SFML/bin/sfml-network-d-2.dll
diff --git a/SFML/bin/sfml-system-2.dll b/lib/SFML/bin/sfml-system-2.dll
similarity index 100%
rename from SFML/bin/sfml-system-2.dll
rename to lib/SFML/bin/sfml-system-2.dll
diff --git a/SFML/bin/sfml-system-d-2.dll b/lib/SFML/bin/sfml-system-d-2.dll
similarity index 100%
rename from SFML/bin/sfml-system-d-2.dll
rename to lib/SFML/bin/sfml-system-d-2.dll
diff --git a/SFML/bin/sfml-window-2.dll b/lib/SFML/bin/sfml-window-2.dll
similarity index 100%
rename from SFML/bin/sfml-window-2.dll
rename to lib/SFML/bin/sfml-window-2.dll
diff --git a/SFML/bin/sfml-window-d-2.dll b/lib/SFML/bin/sfml-window-d-2.dll
similarity index 100%
rename from SFML/bin/sfml-window-d-2.dll
rename to lib/SFML/bin/sfml-window-d-2.dll
diff --git a/SFML/include/SFML/Audio.hpp b/lib/SFML/include/SFML/Audio.hpp
similarity index 100%
rename from SFML/include/SFML/Audio.hpp
rename to lib/SFML/include/SFML/Audio.hpp
diff --git a/SFML/include/SFML/Audio/AlResource.hpp b/lib/SFML/include/SFML/Audio/AlResource.hpp
similarity index 100%
rename from SFML/include/SFML/Audio/AlResource.hpp
rename to lib/SFML/include/SFML/Audio/AlResource.hpp
diff --git a/SFML/include/SFML/Audio/Export.hpp b/lib/SFML/include/SFML/Audio/Export.hpp
similarity index 100%
rename from SFML/include/SFML/Audio/Export.hpp
rename to lib/SFML/include/SFML/Audio/Export.hpp
diff --git a/SFML/include/SFML/Audio/InputSoundFile.hpp b/lib/SFML/include/SFML/Audio/InputSoundFile.hpp
similarity index 100%
rename from SFML/include/SFML/Audio/InputSoundFile.hpp
rename to lib/SFML/include/SFML/Audio/InputSoundFile.hpp
diff --git a/SFML/include/SFML/Audio/Listener.hpp b/lib/SFML/include/SFML/Audio/Listener.hpp
similarity index 100%
rename from SFML/include/SFML/Audio/Listener.hpp
rename to lib/SFML/include/SFML/Audio/Listener.hpp
diff --git a/SFML/include/SFML/Audio/Music.hpp b/lib/SFML/include/SFML/Audio/Music.hpp
similarity index 100%
rename from SFML/include/SFML/Audio/Music.hpp
rename to lib/SFML/include/SFML/Audio/Music.hpp
diff --git a/SFML/include/SFML/Audio/OutputSoundFile.hpp b/lib/SFML/include/SFML/Audio/OutputSoundFile.hpp
similarity index 100%
rename from SFML/include/SFML/Audio/OutputSoundFile.hpp
rename to lib/SFML/include/SFML/Audio/OutputSoundFile.hpp
diff --git a/SFML/include/SFML/Audio/Sound.hpp b/lib/SFML/include/SFML/Audio/Sound.hpp
similarity index 100%
rename from SFML/include/SFML/Audio/Sound.hpp
rename to lib/SFML/include/SFML/Audio/Sound.hpp
diff --git a/SFML/include/SFML/Audio/SoundBuffer.hpp b/lib/SFML/include/SFML/Audio/SoundBuffer.hpp
similarity index 100%
rename from SFML/include/SFML/Audio/SoundBuffer.hpp
rename to lib/SFML/include/SFML/Audio/SoundBuffer.hpp
diff --git a/SFML/include/SFML/Audio/SoundBufferRecorder.hpp b/lib/SFML/include/SFML/Audio/SoundBufferRecorder.hpp
similarity index 100%
rename from SFML/include/SFML/Audio/SoundBufferRecorder.hpp
rename to lib/SFML/include/SFML/Audio/SoundBufferRecorder.hpp
diff --git a/SFML/include/SFML/Audio/SoundFileFactory.hpp b/lib/SFML/include/SFML/Audio/SoundFileFactory.hpp
similarity index 100%
rename from SFML/include/SFML/Audio/SoundFileFactory.hpp
rename to lib/SFML/include/SFML/Audio/SoundFileFactory.hpp
diff --git a/SFML/include/SFML/Audio/SoundFileFactory.inl b/lib/SFML/include/SFML/Audio/SoundFileFactory.inl
similarity index 100%
rename from SFML/include/SFML/Audio/SoundFileFactory.inl
rename to lib/SFML/include/SFML/Audio/SoundFileFactory.inl
diff --git a/SFML/include/SFML/Audio/SoundFileReader.hpp b/lib/SFML/include/SFML/Audio/SoundFileReader.hpp
similarity index 100%
rename from SFML/include/SFML/Audio/SoundFileReader.hpp
rename to lib/SFML/include/SFML/Audio/SoundFileReader.hpp
diff --git a/SFML/include/SFML/Audio/SoundFileWriter.hpp b/lib/SFML/include/SFML/Audio/SoundFileWriter.hpp
similarity index 100%
rename from SFML/include/SFML/Audio/SoundFileWriter.hpp
rename to lib/SFML/include/SFML/Audio/SoundFileWriter.hpp
diff --git a/SFML/include/SFML/Audio/SoundRecorder.hpp b/lib/SFML/include/SFML/Audio/SoundRecorder.hpp
similarity index 100%
rename from SFML/include/SFML/Audio/SoundRecorder.hpp
rename to lib/SFML/include/SFML/Audio/SoundRecorder.hpp
diff --git a/SFML/include/SFML/Audio/SoundSource.hpp b/lib/SFML/include/SFML/Audio/SoundSource.hpp
similarity index 100%
rename from SFML/include/SFML/Audio/SoundSource.hpp
rename to lib/SFML/include/SFML/Audio/SoundSource.hpp
diff --git a/SFML/include/SFML/Audio/SoundStream.hpp b/lib/SFML/include/SFML/Audio/SoundStream.hpp
similarity index 100%
rename from SFML/include/SFML/Audio/SoundStream.hpp
rename to lib/SFML/include/SFML/Audio/SoundStream.hpp
diff --git a/SFML/include/SFML/Config.hpp b/lib/SFML/include/SFML/Config.hpp
similarity index 100%
rename from SFML/include/SFML/Config.hpp
rename to lib/SFML/include/SFML/Config.hpp
diff --git a/SFML/include/SFML/GpuPreference.hpp b/lib/SFML/include/SFML/GpuPreference.hpp
similarity index 100%
rename from SFML/include/SFML/GpuPreference.hpp
rename to lib/SFML/include/SFML/GpuPreference.hpp
diff --git a/SFML/include/SFML/Graphics.hpp b/lib/SFML/include/SFML/Graphics.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics.hpp
rename to lib/SFML/include/SFML/Graphics.hpp
diff --git a/SFML/include/SFML/Graphics/BlendMode.hpp b/lib/SFML/include/SFML/Graphics/BlendMode.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics/BlendMode.hpp
rename to lib/SFML/include/SFML/Graphics/BlendMode.hpp
diff --git a/SFML/include/SFML/Graphics/CircleShape.hpp b/lib/SFML/include/SFML/Graphics/CircleShape.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics/CircleShape.hpp
rename to lib/SFML/include/SFML/Graphics/CircleShape.hpp
diff --git a/SFML/include/SFML/Graphics/Color.hpp b/lib/SFML/include/SFML/Graphics/Color.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics/Color.hpp
rename to lib/SFML/include/SFML/Graphics/Color.hpp
diff --git a/SFML/include/SFML/Graphics/ConvexShape.hpp b/lib/SFML/include/SFML/Graphics/ConvexShape.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics/ConvexShape.hpp
rename to lib/SFML/include/SFML/Graphics/ConvexShape.hpp
diff --git a/SFML/include/SFML/Graphics/Drawable.hpp b/lib/SFML/include/SFML/Graphics/Drawable.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics/Drawable.hpp
rename to lib/SFML/include/SFML/Graphics/Drawable.hpp
diff --git a/SFML/include/SFML/Graphics/Export.hpp b/lib/SFML/include/SFML/Graphics/Export.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics/Export.hpp
rename to lib/SFML/include/SFML/Graphics/Export.hpp
diff --git a/SFML/include/SFML/Graphics/Font.hpp b/lib/SFML/include/SFML/Graphics/Font.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics/Font.hpp
rename to lib/SFML/include/SFML/Graphics/Font.hpp
diff --git a/SFML/include/SFML/Graphics/Glsl.hpp b/lib/SFML/include/SFML/Graphics/Glsl.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics/Glsl.hpp
rename to lib/SFML/include/SFML/Graphics/Glsl.hpp
diff --git a/SFML/include/SFML/Graphics/Glsl.inl b/lib/SFML/include/SFML/Graphics/Glsl.inl
similarity index 100%
rename from SFML/include/SFML/Graphics/Glsl.inl
rename to lib/SFML/include/SFML/Graphics/Glsl.inl
diff --git a/SFML/include/SFML/Graphics/Glyph.hpp b/lib/SFML/include/SFML/Graphics/Glyph.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics/Glyph.hpp
rename to lib/SFML/include/SFML/Graphics/Glyph.hpp
diff --git a/SFML/include/SFML/Graphics/Image.hpp b/lib/SFML/include/SFML/Graphics/Image.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics/Image.hpp
rename to lib/SFML/include/SFML/Graphics/Image.hpp
diff --git a/SFML/include/SFML/Graphics/PrimitiveType.hpp b/lib/SFML/include/SFML/Graphics/PrimitiveType.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics/PrimitiveType.hpp
rename to lib/SFML/include/SFML/Graphics/PrimitiveType.hpp
diff --git a/SFML/include/SFML/Graphics/Rect.hpp b/lib/SFML/include/SFML/Graphics/Rect.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics/Rect.hpp
rename to lib/SFML/include/SFML/Graphics/Rect.hpp
diff --git a/SFML/include/SFML/Graphics/Rect.inl b/lib/SFML/include/SFML/Graphics/Rect.inl
similarity index 100%
rename from SFML/include/SFML/Graphics/Rect.inl
rename to lib/SFML/include/SFML/Graphics/Rect.inl
diff --git a/SFML/include/SFML/Graphics/RectangleShape.hpp b/lib/SFML/include/SFML/Graphics/RectangleShape.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics/RectangleShape.hpp
rename to lib/SFML/include/SFML/Graphics/RectangleShape.hpp
diff --git a/SFML/include/SFML/Graphics/RenderStates.hpp b/lib/SFML/include/SFML/Graphics/RenderStates.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics/RenderStates.hpp
rename to lib/SFML/include/SFML/Graphics/RenderStates.hpp
diff --git a/SFML/include/SFML/Graphics/RenderTarget.hpp b/lib/SFML/include/SFML/Graphics/RenderTarget.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics/RenderTarget.hpp
rename to lib/SFML/include/SFML/Graphics/RenderTarget.hpp
diff --git a/SFML/include/SFML/Graphics/RenderTexture.hpp b/lib/SFML/include/SFML/Graphics/RenderTexture.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics/RenderTexture.hpp
rename to lib/SFML/include/SFML/Graphics/RenderTexture.hpp
diff --git a/SFML/include/SFML/Graphics/RenderWindow.hpp b/lib/SFML/include/SFML/Graphics/RenderWindow.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics/RenderWindow.hpp
rename to lib/SFML/include/SFML/Graphics/RenderWindow.hpp
diff --git a/SFML/include/SFML/Graphics/Shader.hpp b/lib/SFML/include/SFML/Graphics/Shader.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics/Shader.hpp
rename to lib/SFML/include/SFML/Graphics/Shader.hpp
diff --git a/SFML/include/SFML/Graphics/Shape.hpp b/lib/SFML/include/SFML/Graphics/Shape.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics/Shape.hpp
rename to lib/SFML/include/SFML/Graphics/Shape.hpp
diff --git a/SFML/include/SFML/Graphics/Sprite.hpp b/lib/SFML/include/SFML/Graphics/Sprite.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics/Sprite.hpp
rename to lib/SFML/include/SFML/Graphics/Sprite.hpp
diff --git a/SFML/include/SFML/Graphics/Text.hpp b/lib/SFML/include/SFML/Graphics/Text.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics/Text.hpp
rename to lib/SFML/include/SFML/Graphics/Text.hpp
diff --git a/SFML/include/SFML/Graphics/Texture.hpp b/lib/SFML/include/SFML/Graphics/Texture.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics/Texture.hpp
rename to lib/SFML/include/SFML/Graphics/Texture.hpp
diff --git a/SFML/include/SFML/Graphics/Transform.hpp b/lib/SFML/include/SFML/Graphics/Transform.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics/Transform.hpp
rename to lib/SFML/include/SFML/Graphics/Transform.hpp
diff --git a/SFML/include/SFML/Graphics/Transformable.hpp b/lib/SFML/include/SFML/Graphics/Transformable.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics/Transformable.hpp
rename to lib/SFML/include/SFML/Graphics/Transformable.hpp
diff --git a/SFML/include/SFML/Graphics/Vertex.hpp b/lib/SFML/include/SFML/Graphics/Vertex.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics/Vertex.hpp
rename to lib/SFML/include/SFML/Graphics/Vertex.hpp
diff --git a/SFML/include/SFML/Graphics/VertexArray.hpp b/lib/SFML/include/SFML/Graphics/VertexArray.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics/VertexArray.hpp
rename to lib/SFML/include/SFML/Graphics/VertexArray.hpp
diff --git a/SFML/include/SFML/Graphics/VertexBuffer.hpp b/lib/SFML/include/SFML/Graphics/VertexBuffer.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics/VertexBuffer.hpp
rename to lib/SFML/include/SFML/Graphics/VertexBuffer.hpp
diff --git a/SFML/include/SFML/Graphics/View.hpp b/lib/SFML/include/SFML/Graphics/View.hpp
similarity index 100%
rename from SFML/include/SFML/Graphics/View.hpp
rename to lib/SFML/include/SFML/Graphics/View.hpp
diff --git a/SFML/include/SFML/Main.hpp b/lib/SFML/include/SFML/Main.hpp
similarity index 100%
rename from SFML/include/SFML/Main.hpp
rename to lib/SFML/include/SFML/Main.hpp
diff --git a/SFML/include/SFML/Network.hpp b/lib/SFML/include/SFML/Network.hpp
similarity index 100%
rename from SFML/include/SFML/Network.hpp
rename to lib/SFML/include/SFML/Network.hpp
diff --git a/SFML/include/SFML/Network/Export.hpp b/lib/SFML/include/SFML/Network/Export.hpp
similarity index 100%
rename from SFML/include/SFML/Network/Export.hpp
rename to lib/SFML/include/SFML/Network/Export.hpp
diff --git a/SFML/include/SFML/Network/Ftp.hpp b/lib/SFML/include/SFML/Network/Ftp.hpp
similarity index 100%
rename from SFML/include/SFML/Network/Ftp.hpp
rename to lib/SFML/include/SFML/Network/Ftp.hpp
diff --git a/SFML/include/SFML/Network/Http.hpp b/lib/SFML/include/SFML/Network/Http.hpp
similarity index 100%
rename from SFML/include/SFML/Network/Http.hpp
rename to lib/SFML/include/SFML/Network/Http.hpp
diff --git a/SFML/include/SFML/Network/IpAddress.hpp b/lib/SFML/include/SFML/Network/IpAddress.hpp
similarity index 100%
rename from SFML/include/SFML/Network/IpAddress.hpp
rename to lib/SFML/include/SFML/Network/IpAddress.hpp
diff --git a/SFML/include/SFML/Network/Packet.hpp b/lib/SFML/include/SFML/Network/Packet.hpp
similarity index 100%
rename from SFML/include/SFML/Network/Packet.hpp
rename to lib/SFML/include/SFML/Network/Packet.hpp
diff --git a/SFML/include/SFML/Network/Socket.hpp b/lib/SFML/include/SFML/Network/Socket.hpp
similarity index 100%
rename from SFML/include/SFML/Network/Socket.hpp
rename to lib/SFML/include/SFML/Network/Socket.hpp
diff --git a/SFML/include/SFML/Network/SocketHandle.hpp b/lib/SFML/include/SFML/Network/SocketHandle.hpp
similarity index 100%
rename from SFML/include/SFML/Network/SocketHandle.hpp
rename to lib/SFML/include/SFML/Network/SocketHandle.hpp
diff --git a/SFML/include/SFML/Network/SocketSelector.hpp b/lib/SFML/include/SFML/Network/SocketSelector.hpp
similarity index 100%
rename from SFML/include/SFML/Network/SocketSelector.hpp
rename to lib/SFML/include/SFML/Network/SocketSelector.hpp
diff --git a/SFML/include/SFML/Network/TcpListener.hpp b/lib/SFML/include/SFML/Network/TcpListener.hpp
similarity index 100%
rename from SFML/include/SFML/Network/TcpListener.hpp
rename to lib/SFML/include/SFML/Network/TcpListener.hpp
diff --git a/SFML/include/SFML/Network/TcpSocket.hpp b/lib/SFML/include/SFML/Network/TcpSocket.hpp
similarity index 100%
rename from SFML/include/SFML/Network/TcpSocket.hpp
rename to lib/SFML/include/SFML/Network/TcpSocket.hpp
diff --git a/SFML/include/SFML/Network/UdpSocket.hpp b/lib/SFML/include/SFML/Network/UdpSocket.hpp
similarity index 100%
rename from SFML/include/SFML/Network/UdpSocket.hpp
rename to lib/SFML/include/SFML/Network/UdpSocket.hpp
diff --git a/SFML/include/SFML/OpenGL.hpp b/lib/SFML/include/SFML/OpenGL.hpp
similarity index 100%
rename from SFML/include/SFML/OpenGL.hpp
rename to lib/SFML/include/SFML/OpenGL.hpp
diff --git a/SFML/include/SFML/System.hpp b/lib/SFML/include/SFML/System.hpp
similarity index 100%
rename from SFML/include/SFML/System.hpp
rename to lib/SFML/include/SFML/System.hpp
diff --git a/SFML/include/SFML/System/Clock.hpp b/lib/SFML/include/SFML/System/Clock.hpp
similarity index 100%
rename from SFML/include/SFML/System/Clock.hpp
rename to lib/SFML/include/SFML/System/Clock.hpp
diff --git a/SFML/include/SFML/System/Err.hpp b/lib/SFML/include/SFML/System/Err.hpp
similarity index 100%
rename from SFML/include/SFML/System/Err.hpp
rename to lib/SFML/include/SFML/System/Err.hpp
diff --git a/SFML/include/SFML/System/Export.hpp b/lib/SFML/include/SFML/System/Export.hpp
similarity index 100%
rename from SFML/include/SFML/System/Export.hpp
rename to lib/SFML/include/SFML/System/Export.hpp
diff --git a/SFML/include/SFML/System/FileInputStream.hpp b/lib/SFML/include/SFML/System/FileInputStream.hpp
similarity index 100%
rename from SFML/include/SFML/System/FileInputStream.hpp
rename to lib/SFML/include/SFML/System/FileInputStream.hpp
diff --git a/SFML/include/SFML/System/InputStream.hpp b/lib/SFML/include/SFML/System/InputStream.hpp
similarity index 100%
rename from SFML/include/SFML/System/InputStream.hpp
rename to lib/SFML/include/SFML/System/InputStream.hpp
diff --git a/SFML/include/SFML/System/Lock.hpp b/lib/SFML/include/SFML/System/Lock.hpp
similarity index 100%
rename from SFML/include/SFML/System/Lock.hpp
rename to lib/SFML/include/SFML/System/Lock.hpp
diff --git a/SFML/include/SFML/System/MemoryInputStream.hpp b/lib/SFML/include/SFML/System/MemoryInputStream.hpp
similarity index 100%
rename from SFML/include/SFML/System/MemoryInputStream.hpp
rename to lib/SFML/include/SFML/System/MemoryInputStream.hpp
diff --git a/SFML/include/SFML/System/Mutex.hpp b/lib/SFML/include/SFML/System/Mutex.hpp
similarity index 100%
rename from SFML/include/SFML/System/Mutex.hpp
rename to lib/SFML/include/SFML/System/Mutex.hpp
diff --git a/SFML/include/SFML/System/NativeActivity.hpp b/lib/SFML/include/SFML/System/NativeActivity.hpp
similarity index 100%
rename from SFML/include/SFML/System/NativeActivity.hpp
rename to lib/SFML/include/SFML/System/NativeActivity.hpp
diff --git a/SFML/include/SFML/System/NonCopyable.hpp b/lib/SFML/include/SFML/System/NonCopyable.hpp
similarity index 100%
rename from SFML/include/SFML/System/NonCopyable.hpp
rename to lib/SFML/include/SFML/System/NonCopyable.hpp
diff --git a/SFML/include/SFML/System/Sleep.hpp b/lib/SFML/include/SFML/System/Sleep.hpp
similarity index 100%
rename from SFML/include/SFML/System/Sleep.hpp
rename to lib/SFML/include/SFML/System/Sleep.hpp
diff --git a/SFML/include/SFML/System/String.hpp b/lib/SFML/include/SFML/System/String.hpp
similarity index 100%
rename from SFML/include/SFML/System/String.hpp
rename to lib/SFML/include/SFML/System/String.hpp
diff --git a/SFML/include/SFML/System/String.inl b/lib/SFML/include/SFML/System/String.inl
similarity index 100%
rename from SFML/include/SFML/System/String.inl
rename to lib/SFML/include/SFML/System/String.inl
diff --git a/SFML/include/SFML/System/Thread.hpp b/lib/SFML/include/SFML/System/Thread.hpp
similarity index 100%
rename from SFML/include/SFML/System/Thread.hpp
rename to lib/SFML/include/SFML/System/Thread.hpp
diff --git a/SFML/include/SFML/System/Thread.inl b/lib/SFML/include/SFML/System/Thread.inl
similarity index 100%
rename from SFML/include/SFML/System/Thread.inl
rename to lib/SFML/include/SFML/System/Thread.inl
diff --git a/SFML/include/SFML/System/ThreadLocal.hpp b/lib/SFML/include/SFML/System/ThreadLocal.hpp
similarity index 100%
rename from SFML/include/SFML/System/ThreadLocal.hpp
rename to lib/SFML/include/SFML/System/ThreadLocal.hpp
diff --git a/SFML/include/SFML/System/ThreadLocalPtr.hpp b/lib/SFML/include/SFML/System/ThreadLocalPtr.hpp
similarity index 100%
rename from SFML/include/SFML/System/ThreadLocalPtr.hpp
rename to lib/SFML/include/SFML/System/ThreadLocalPtr.hpp
diff --git a/SFML/include/SFML/System/ThreadLocalPtr.inl b/lib/SFML/include/SFML/System/ThreadLocalPtr.inl
similarity index 100%
rename from SFML/include/SFML/System/ThreadLocalPtr.inl
rename to lib/SFML/include/SFML/System/ThreadLocalPtr.inl
diff --git a/SFML/include/SFML/System/Time.hpp b/lib/SFML/include/SFML/System/Time.hpp
similarity index 100%
rename from SFML/include/SFML/System/Time.hpp
rename to lib/SFML/include/SFML/System/Time.hpp
diff --git a/SFML/include/SFML/System/Utf.hpp b/lib/SFML/include/SFML/System/Utf.hpp
similarity index 100%
rename from SFML/include/SFML/System/Utf.hpp
rename to lib/SFML/include/SFML/System/Utf.hpp
diff --git a/SFML/include/SFML/System/Utf.inl b/lib/SFML/include/SFML/System/Utf.inl
similarity index 100%
rename from SFML/include/SFML/System/Utf.inl
rename to lib/SFML/include/SFML/System/Utf.inl
diff --git a/SFML/include/SFML/System/Vector2.hpp b/lib/SFML/include/SFML/System/Vector2.hpp
similarity index 100%
rename from SFML/include/SFML/System/Vector2.hpp
rename to lib/SFML/include/SFML/System/Vector2.hpp
diff --git a/SFML/include/SFML/System/Vector2.inl b/lib/SFML/include/SFML/System/Vector2.inl
similarity index 100%
rename from SFML/include/SFML/System/Vector2.inl
rename to lib/SFML/include/SFML/System/Vector2.inl
diff --git a/SFML/include/SFML/System/Vector3.hpp b/lib/SFML/include/SFML/System/Vector3.hpp
similarity index 100%
rename from SFML/include/SFML/System/Vector3.hpp
rename to lib/SFML/include/SFML/System/Vector3.hpp
diff --git a/SFML/include/SFML/System/Vector3.inl b/lib/SFML/include/SFML/System/Vector3.inl
similarity index 100%
rename from SFML/include/SFML/System/Vector3.inl
rename to lib/SFML/include/SFML/System/Vector3.inl
diff --git a/SFML/include/SFML/Window.hpp b/lib/SFML/include/SFML/Window.hpp
similarity index 100%
rename from SFML/include/SFML/Window.hpp
rename to lib/SFML/include/SFML/Window.hpp
diff --git a/SFML/include/SFML/Window/Clipboard.hpp b/lib/SFML/include/SFML/Window/Clipboard.hpp
similarity index 100%
rename from SFML/include/SFML/Window/Clipboard.hpp
rename to lib/SFML/include/SFML/Window/Clipboard.hpp
diff --git a/SFML/include/SFML/Window/Context.hpp b/lib/SFML/include/SFML/Window/Context.hpp
similarity index 100%
rename from SFML/include/SFML/Window/Context.hpp
rename to lib/SFML/include/SFML/Window/Context.hpp
diff --git a/SFML/include/SFML/Window/ContextSettings.hpp b/lib/SFML/include/SFML/Window/ContextSettings.hpp
similarity index 100%
rename from SFML/include/SFML/Window/ContextSettings.hpp
rename to lib/SFML/include/SFML/Window/ContextSettings.hpp
diff --git a/SFML/include/SFML/Window/Cursor.hpp b/lib/SFML/include/SFML/Window/Cursor.hpp
similarity index 100%
rename from SFML/include/SFML/Window/Cursor.hpp
rename to lib/SFML/include/SFML/Window/Cursor.hpp
diff --git a/SFML/include/SFML/Window/Event.hpp b/lib/SFML/include/SFML/Window/Event.hpp
similarity index 100%
rename from SFML/include/SFML/Window/Event.hpp
rename to lib/SFML/include/SFML/Window/Event.hpp
diff --git a/SFML/include/SFML/Window/Export.hpp b/lib/SFML/include/SFML/Window/Export.hpp
similarity index 100%
rename from SFML/include/SFML/Window/Export.hpp
rename to lib/SFML/include/SFML/Window/Export.hpp
diff --git a/SFML/include/SFML/Window/GlResource.hpp b/lib/SFML/include/SFML/Window/GlResource.hpp
similarity index 100%
rename from SFML/include/SFML/Window/GlResource.hpp
rename to lib/SFML/include/SFML/Window/GlResource.hpp
diff --git a/SFML/include/SFML/Window/Joystick.hpp b/lib/SFML/include/SFML/Window/Joystick.hpp
similarity index 100%
rename from SFML/include/SFML/Window/Joystick.hpp
rename to lib/SFML/include/SFML/Window/Joystick.hpp
diff --git a/SFML/include/SFML/Window/Keyboard.hpp b/lib/SFML/include/SFML/Window/Keyboard.hpp
similarity index 100%
rename from SFML/include/SFML/Window/Keyboard.hpp
rename to lib/SFML/include/SFML/Window/Keyboard.hpp
diff --git a/SFML/include/SFML/Window/Mouse.hpp b/lib/SFML/include/SFML/Window/Mouse.hpp
similarity index 100%
rename from SFML/include/SFML/Window/Mouse.hpp
rename to lib/SFML/include/SFML/Window/Mouse.hpp
diff --git a/SFML/include/SFML/Window/Sensor.hpp b/lib/SFML/include/SFML/Window/Sensor.hpp
similarity index 100%
rename from SFML/include/SFML/Window/Sensor.hpp
rename to lib/SFML/include/SFML/Window/Sensor.hpp
diff --git a/SFML/include/SFML/Window/Touch.hpp b/lib/SFML/include/SFML/Window/Touch.hpp
similarity index 100%
rename from SFML/include/SFML/Window/Touch.hpp
rename to lib/SFML/include/SFML/Window/Touch.hpp
diff --git a/SFML/include/SFML/Window/VideoMode.hpp b/lib/SFML/include/SFML/Window/VideoMode.hpp
similarity index 100%
rename from SFML/include/SFML/Window/VideoMode.hpp
rename to lib/SFML/include/SFML/Window/VideoMode.hpp
diff --git a/SFML/include/SFML/Window/Vulkan.hpp b/lib/SFML/include/SFML/Window/Vulkan.hpp
similarity index 100%
rename from SFML/include/SFML/Window/Vulkan.hpp
rename to lib/SFML/include/SFML/Window/Vulkan.hpp
diff --git a/SFML/include/SFML/Window/Window.hpp b/lib/SFML/include/SFML/Window/Window.hpp
similarity index 100%
rename from SFML/include/SFML/Window/Window.hpp
rename to lib/SFML/include/SFML/Window/Window.hpp
diff --git a/SFML/include/SFML/Window/WindowBase.hpp b/lib/SFML/include/SFML/Window/WindowBase.hpp
similarity index 100%
rename from SFML/include/SFML/Window/WindowBase.hpp
rename to lib/SFML/include/SFML/Window/WindowBase.hpp
diff --git a/SFML/include/SFML/Window/WindowHandle.hpp b/lib/SFML/include/SFML/Window/WindowHandle.hpp
similarity index 100%
rename from SFML/include/SFML/Window/WindowHandle.hpp
rename to lib/SFML/include/SFML/Window/WindowHandle.hpp
diff --git a/SFML/include/SFML/Window/WindowStyle.hpp b/lib/SFML/include/SFML/Window/WindowStyle.hpp
similarity index 100%
rename from SFML/include/SFML/Window/WindowStyle.hpp
rename to lib/SFML/include/SFML/Window/WindowStyle.hpp
diff --git a/SFML/lib/cmake/SFML/SFMLConfig.cmake b/lib/SFML/lib/cmake/SFML/SFMLConfig.cmake
similarity index 98%
rename from SFML/lib/cmake/SFML/SFMLConfig.cmake
rename to lib/SFML/lib/cmake/SFML/SFMLConfig.cmake
index e9e218f..f2491d7 100644
--- a/SFML/lib/cmake/SFML/SFMLConfig.cmake
+++ b/lib/SFML/lib/cmake/SFML/SFMLConfig.cmake
@@ -64,7 +64,7 @@ if (NOT SFML_FIND_COMPONENTS)
 endif()
 
 set(FIND_SFML_PATHS
-    "${CMAKE_CURRENT_LIST_DIR}/../.."
+    "../.."
     ${SFML_ROOT}
     $ENV{SFML_ROOT}
     ~/Library/Frameworks
@@ -114,7 +114,7 @@ if (EXISTS "${targets_config_file}")
     # Set SFML_FOUND to TRUE by default, may be overwritten by one of the includes below
     set(SFML_FOUND TRUE)
     include("${targets_config_file}")
-    include("${CMAKE_CURRENT_LIST_DIR}/SFMLConfigDependencies.cmake")
+    include("SFMLConfigDependencies.cmake")
 
     if (SFML_FOUND)
         foreach (component ${SFML_FIND_COMPONENTS})
diff --git a/SFML/lib/cmake/SFML/SFMLConfigDependencies.cmake b/lib/SFML/lib/cmake/SFML/SFMLConfigDependencies.cmake
similarity index 100%
rename from SFML/lib/cmake/SFML/SFMLConfigDependencies.cmake
rename to lib/SFML/lib/cmake/SFML/SFMLConfigDependencies.cmake
diff --git a/SFML/lib/cmake/SFML/SFMLConfigVersion.cmake b/lib/SFML/lib/cmake/SFML/SFMLConfigVersion.cmake
similarity index 100%
rename from SFML/lib/cmake/SFML/SFMLConfigVersion.cmake
rename to lib/SFML/lib/cmake/SFML/SFMLConfigVersion.cmake
diff --git a/SFML/lib/cmake/SFML/SFMLSharedTargets-debug.cmake b/lib/SFML/lib/cmake/SFML/SFMLSharedTargets-debug.cmake
similarity index 100%
rename from SFML/lib/cmake/SFML/SFMLSharedTargets-debug.cmake
rename to lib/SFML/lib/cmake/SFML/SFMLSharedTargets-debug.cmake
diff --git a/SFML/lib/cmake/SFML/SFMLSharedTargets-release.cmake b/lib/SFML/lib/cmake/SFML/SFMLSharedTargets-release.cmake
similarity index 100%
rename from SFML/lib/cmake/SFML/SFMLSharedTargets-release.cmake
rename to lib/SFML/lib/cmake/SFML/SFMLSharedTargets-release.cmake
diff --git a/SFML/lib/cmake/SFML/SFMLSharedTargets.cmake b/lib/SFML/lib/cmake/SFML/SFMLSharedTargets.cmake
similarity index 98%
rename from SFML/lib/cmake/SFML/SFMLSharedTargets.cmake
rename to lib/SFML/lib/cmake/SFML/SFMLSharedTargets.cmake
index 60df8ec..a42f5a8 100644
--- a/SFML/lib/cmake/SFML/SFMLSharedTargets.cmake
+++ b/lib/SFML/lib/cmake/SFML/SFMLSharedTargets.cmake
@@ -47,11 +47,11 @@ unset(_cmake_expected_targets)
 
 
 # Compute the installation prefix relative to this file.
-get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_IMPORT_PREFIX "SFMLSharedTargets.cmake" PATH)
 get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
 get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
 get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-if(_IMPORT_PREFIX STREQUAL "/")
+if(_IMPORT_PREFIX STREQUAL ".")
   set(_IMPORT_PREFIX "")
 endif()
 
diff --git a/SFML/lib/cmake/SFML/SFMLStaticTargets-debug.cmake b/lib/SFML/lib/cmake/SFML/SFMLStaticTargets-debug.cmake
similarity index 100%
rename from SFML/lib/cmake/SFML/SFMLStaticTargets-debug.cmake
rename to lib/SFML/lib/cmake/SFML/SFMLStaticTargets-debug.cmake
diff --git a/SFML/lib/cmake/SFML/SFMLStaticTargets-release.cmake b/lib/SFML/lib/cmake/SFML/SFMLStaticTargets-release.cmake
similarity index 100%
rename from SFML/lib/cmake/SFML/SFMLStaticTargets-release.cmake
rename to lib/SFML/lib/cmake/SFML/SFMLStaticTargets-release.cmake
diff --git a/SFML/lib/cmake/SFML/SFMLStaticTargets.cmake b/lib/SFML/lib/cmake/SFML/SFMLStaticTargets.cmake
similarity index 98%
rename from SFML/lib/cmake/SFML/SFMLStaticTargets.cmake
rename to lib/SFML/lib/cmake/SFML/SFMLStaticTargets.cmake
index 81b37d7..6982e40 100644
--- a/SFML/lib/cmake/SFML/SFMLStaticTargets.cmake
+++ b/lib/SFML/lib/cmake/SFML/SFMLStaticTargets.cmake
@@ -47,11 +47,11 @@ unset(_cmake_expected_targets)
 
 
 # Compute the installation prefix relative to this file.
-get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_IMPORT_PREFIX "SFMLStaticTargets.cmake" PATH)
 get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
 get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
 get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-if(_IMPORT_PREFIX STREQUAL "/")
+if(_IMPORT_PREFIX STREQUAL ".")
   set(_IMPORT_PREFIX "")
 endif()
 
diff --git a/SFML/lib/libFLAC.a b/lib/SFML/lib/libFLAC.a
similarity index 100%
rename from SFML/lib/libFLAC.a
rename to lib/SFML/lib/libFLAC.a
diff --git a/SFML/lib/libfreetype.a b/lib/SFML/lib/libfreetype.a
similarity index 100%
rename from SFML/lib/libfreetype.a
rename to lib/SFML/lib/libfreetype.a
diff --git a/SFML/lib/libogg.a b/lib/SFML/lib/libogg.a
similarity index 100%
rename from SFML/lib/libogg.a
rename to lib/SFML/lib/libogg.a
diff --git a/SFML/lib/libopenal32.a b/lib/SFML/lib/libopenal32.a
similarity index 100%
rename from SFML/lib/libopenal32.a
rename to lib/SFML/lib/libopenal32.a
diff --git a/SFML/lib/libsfml-audio-d.a b/lib/SFML/lib/libsfml-audio-d.a
similarity index 100%
rename from SFML/lib/libsfml-audio-d.a
rename to lib/SFML/lib/libsfml-audio-d.a
diff --git a/SFML/lib/libsfml-audio-s-d.a b/lib/SFML/lib/libsfml-audio-s-d.a
similarity index 100%
rename from SFML/lib/libsfml-audio-s-d.a
rename to lib/SFML/lib/libsfml-audio-s-d.a
diff --git a/SFML/lib/libsfml-audio-s.a b/lib/SFML/lib/libsfml-audio-s.a
similarity index 100%
rename from SFML/lib/libsfml-audio-s.a
rename to lib/SFML/lib/libsfml-audio-s.a
diff --git a/SFML/lib/libsfml-audio.a b/lib/SFML/lib/libsfml-audio.a
similarity index 100%
rename from SFML/lib/libsfml-audio.a
rename to lib/SFML/lib/libsfml-audio.a
diff --git a/SFML/lib/libsfml-graphics-d.a b/lib/SFML/lib/libsfml-graphics-d.a
similarity index 100%
rename from SFML/lib/libsfml-graphics-d.a
rename to lib/SFML/lib/libsfml-graphics-d.a
diff --git a/SFML/lib/libsfml-graphics-s-d.a b/lib/SFML/lib/libsfml-graphics-s-d.a
similarity index 100%
rename from SFML/lib/libsfml-graphics-s-d.a
rename to lib/SFML/lib/libsfml-graphics-s-d.a
diff --git a/SFML/lib/libsfml-graphics-s.a b/lib/SFML/lib/libsfml-graphics-s.a
similarity index 100%
rename from SFML/lib/libsfml-graphics-s.a
rename to lib/SFML/lib/libsfml-graphics-s.a
diff --git a/SFML/lib/libsfml-graphics.a b/lib/SFML/lib/libsfml-graphics.a
similarity index 100%
rename from SFML/lib/libsfml-graphics.a
rename to lib/SFML/lib/libsfml-graphics.a
diff --git a/SFML/lib/libsfml-main-d.a b/lib/SFML/lib/libsfml-main-d.a
similarity index 100%
rename from SFML/lib/libsfml-main-d.a
rename to lib/SFML/lib/libsfml-main-d.a
diff --git a/SFML/lib/libsfml-main.a b/lib/SFML/lib/libsfml-main.a
similarity index 100%
rename from SFML/lib/libsfml-main.a
rename to lib/SFML/lib/libsfml-main.a
diff --git a/SFML/lib/libsfml-network-d.a b/lib/SFML/lib/libsfml-network-d.a
similarity index 100%
rename from SFML/lib/libsfml-network-d.a
rename to lib/SFML/lib/libsfml-network-d.a
diff --git a/SFML/lib/libsfml-network-s-d.a b/lib/SFML/lib/libsfml-network-s-d.a
similarity index 100%
rename from SFML/lib/libsfml-network-s-d.a
rename to lib/SFML/lib/libsfml-network-s-d.a
diff --git a/SFML/lib/libsfml-network-s.a b/lib/SFML/lib/libsfml-network-s.a
similarity index 100%
rename from SFML/lib/libsfml-network-s.a
rename to lib/SFML/lib/libsfml-network-s.a
diff --git a/SFML/lib/libsfml-network.a b/lib/SFML/lib/libsfml-network.a
similarity index 100%
rename from SFML/lib/libsfml-network.a
rename to lib/SFML/lib/libsfml-network.a
diff --git a/SFML/lib/libsfml-system-d.a b/lib/SFML/lib/libsfml-system-d.a
similarity index 100%
rename from SFML/lib/libsfml-system-d.a
rename to lib/SFML/lib/libsfml-system-d.a
diff --git a/SFML/lib/libsfml-system-s-d.a b/lib/SFML/lib/libsfml-system-s-d.a
similarity index 100%
rename from SFML/lib/libsfml-system-s-d.a
rename to lib/SFML/lib/libsfml-system-s-d.a
diff --git a/SFML/lib/libsfml-system-s.a b/lib/SFML/lib/libsfml-system-s.a
similarity index 100%
rename from SFML/lib/libsfml-system-s.a
rename to lib/SFML/lib/libsfml-system-s.a
diff --git a/SFML/lib/libsfml-system.a b/lib/SFML/lib/libsfml-system.a
similarity index 100%
rename from SFML/lib/libsfml-system.a
rename to lib/SFML/lib/libsfml-system.a
diff --git a/SFML/lib/libsfml-window-d.a b/lib/SFML/lib/libsfml-window-d.a
similarity index 100%
rename from SFML/lib/libsfml-window-d.a
rename to lib/SFML/lib/libsfml-window-d.a
diff --git a/SFML/lib/libsfml-window-s-d.a b/lib/SFML/lib/libsfml-window-s-d.a
similarity index 100%
rename from SFML/lib/libsfml-window-s-d.a
rename to lib/SFML/lib/libsfml-window-s-d.a
diff --git a/SFML/lib/libsfml-window-s.a b/lib/SFML/lib/libsfml-window-s.a
similarity index 100%
rename from SFML/lib/libsfml-window-s.a
rename to lib/SFML/lib/libsfml-window-s.a
diff --git a/SFML/lib/libsfml-window.a b/lib/SFML/lib/libsfml-window.a
similarity index 100%
rename from SFML/lib/libsfml-window.a
rename to lib/SFML/lib/libsfml-window.a
diff --git a/SFML/lib/libvorbis.a b/lib/SFML/lib/libvorbis.a
similarity index 100%
rename from SFML/lib/libvorbis.a
rename to lib/SFML/lib/libvorbis.a
diff --git a/SFML/lib/libvorbisenc.a b/lib/SFML/lib/libvorbisenc.a
similarity index 100%
rename from SFML/lib/libvorbisenc.a
rename to lib/SFML/lib/libvorbisenc.a
diff --git a/SFML/lib/libvorbisfile.a b/lib/SFML/lib/libvorbisfile.a
similarity index 100%
rename from SFML/lib/libvorbisfile.a
rename to lib/SFML/lib/libvorbisfile.a