[Closes #30] Fixed read-only field misalignment and organized project structure