Changed folder architecture. WIP
add setup file