Moved source into separate directory