Fix variable star length
New project structure