Refactoring loading parts into seperate files
Added new files to test