Restructured project for further developing