Moved source files out of src folder