Work

Just some changes in the file structures