Improved code and project's data structure