Re-struct project for my usage