!!! Re-structure project