Re-coded and re-organized entire project