Alpha version and new file structure