Moved source into single directory