Version 2

Only necessary files