Refactored folder structure to be linuxy