Project structured and splitted to many files (still buggy)