Moved some folders into src folder