Moved parts into own folder